]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st/widget: Switch to the new API to get actor from inputdevice
authorJonas Dreßler <verdre@v0yd.nl>
Thu, 15 Oct 2020 15:00:16 +0000 (17:00 +0200)
committerJonas Dreßler <verdre@v0yd.nl>
Fri, 18 Dec 2020 14:21:29 +0000 (15:21 +0100)
clutter_input_device_get_actor() was removed in favour of
clutter_stage_get_device_actor(), so use that.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1537>

src/st/st-widget.c

index bfce545722cc9cade8cbe0edd46179654ac4e321..2ee74af0811a88d76dec720fb1eeff267ca0a64b 100644 (file)
@@ -1865,12 +1865,17 @@ void
 st_widget_sync_hover (StWidget *widget)
 {
   ClutterInputDevice *pointer;
+  ClutterActor *stage;
   ClutterActor *pointer_actor;
   ClutterSeat *seat;
 
   seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
   pointer = clutter_seat_get_pointer (seat);
-  pointer_actor = clutter_input_device_get_actor (pointer, NULL);
+  stage = clutter_actor_get_stage (CLUTTER_ACTOR (widget));
+  if (!stage)
+    return;
+
+  pointer_actor = clutter_stage_get_device_actor (CLUTTER_STAGE (stage), pointer, NULL);
   if (pointer_actor && clutter_actor_get_reactive (CLUTTER_ACTOR (widget)))
     st_widget_set_hover (widget, clutter_actor_contains (CLUTTER_ACTOR (widget), pointer_actor));
   else